Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: Ia2d7768fde98b572517f91f995fbffa7fe974737