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

Change-Id: I6609ec79dbbefd53214f4dcd7cea5313cffd3002