Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: Ibd562e9029f537b0bd6b8f9c82757394d06c240c