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

Change-Id: Id25b70e1ff90059f5975e707ccf9524116d44366