Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: I34a55f3f80c6fc006facd1e50003568f40f1d3be