Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: I7b84b8af5e3e8b2a4e2339a72a1fc4fdb0e605f8