Merge changes I14c49cb4,I12d17fe1

* changes:
  Inject ChangeUtil, making most methods non-static
  Inject ApprovalsUtil in more places