am 22cb5b37: Merge "Migrate to using Mockito directly."

* commit '22cb5b37a572270788f00881727f483da373ec05':
  Migrate to using Mockito directly.