Merge "Fix QuotaController constants."
am: 4017f8be2f

Change-Id: I51d77968eeb3eede4f216d9dc968ab37bfdf10f0