Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I5ff04dcf7727a877e60c24052fad19e24bf0cd14