Merge "Fix failing quota tests in stable branches"