Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I03a1783272028ba3d2c42f5f4c2cfe9c072dd599