Merge "Skip over quota tests if quota tests disabled"