Merge "Revert "Update to Mockito v2.25.7."" am: f888fde3ee am: 016a024565
am: 2ea509f094

Change-Id: I90060e834358e7b004fc4366097269c16f131827