Merge "Refactor quota ops to a separate utils"
am: ad25300196

Change-Id: I6daf56ed4338950881f4faf15b167f1afff40bcc