Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: I2c247c7d46e49ffb80edda7cc38f22d5beb61fb3