Merge "Fix BackupQuotaTest CTS test." into nyc-dev