Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I90ab82089113fe94ff307cc6a2b28f32efba0a5e