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

Change-Id: I7a4149b48f73e3454f48e1c3d652d98d50c9b933