Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I32c9a8edf65bfb8f2d99a2515a299b452ab2340f