Merge "Update to Mockito v2.25.7." am: 568b38a0b3 am: c56ba0b276
am: b09c435528

Change-Id: I613eb7b8169874423f8c8960cde2520b553617d7