[automerger skipped] Merge "Fix QuotaController constants." into qt-qpr1-dev
am: af18cb56bf -s ours
am skip reason: change_id I3e2848446b20f7258fac2d96566c96aea5715949 with SHA1 24cbc741d5 is in history

Change-Id: I7254c1dfd2cee9db2bf8b9501d5d29ab55e102e6