Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: I9bede8e7cd3c93525d78af23462740585df5e7f2