Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Ie07ffdb1142b01862a0a18a3b0f9b920402613dc