Merge "ARC++ swap for QuotaUtils"