Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: Ibffbb4e7f06207b7f0ab6cd37e26930bfc0101ec