Merge "update test framework to use Mockito 2.12"