Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.25.0

Change-Id: I94658af2a915b200fc54fb0b5634e93680543621