Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I10f72132883741d80e57b3ed4e737391d9bf16fd