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

Change-Id: Icd99266689cc42438eef81d1bc13b4df5157fe2d