Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I1132120fa61b74fc3543269b2e286e0d02284f3b