Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I3d81a5fe1066feaff9d6a7fd0dae5ca0a584b059