Merge "Fix QuotaController constants." am: 4017f8be2f
am: 29a7524bdd

Change-Id: If2e03e2fac92e07d37968a749c33ecc8e245b8ad