Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: Ibd8ae5521cc21f290d97ace9a3423357d1b2f9ef