Merge "Refactor quota ops to a separate utils"