Merge "Fix QuotaController constants."