Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: Ic70cdc6ac525aafbb359fcbcd5da4ee3d94e8f14