am eefa2595: Merge "Add a dependency on Mockito"

* commit 'eefa2595a94d9c4158dd4a948ba1865f1f488b5e':
  Add a dependency on Mockito