Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: I360df69e68aebe2fa5679509be51d483080289e9