Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.24.5

Change-Id: I194e56fc52d90542f3ac4e646a9e8b06040246b4