Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: Ieec1933f225452ef609768160e84baec5c664af7