Merge "Fix KeyValueQuotaTest." into pi-dev