Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I445b28d42005f43103e70c4f6eb8c8b675ea33a2