Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Icb0622839b278ccb8fa9bc8d65e754c1afbb29ec