Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: I7fb3c623c559b18e48ac3201ccab689b046ffb82