Merge "Revert "Update to Mockito v2.25.7.""