Merge "ARC++ swap for QuotaUtils" am: de6858efc7
am: 8ca9a21450

Change-Id: Icd9ea887903cddd5ad8f6ca22df66e9fb86640bf