Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I36fb7ea8654f3a5f009cdb49c9fa94cba199d7db