Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.25.1

Change-Id: If3a6b8d8c0648b6386f9c2c81c0f8f9dac415151