Merge "Refactor quota ops to a separate utils" am: ad25300196 am: 3b7065a70c
am: 862f38debe

Change-Id: I00b30e55306868cd28960834bab705c3b6f1bb54