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

Change-Id: I560d6cbbc685a3a1c619cf908258dbe347e59c6b