Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I923794d45e3fc34f095ec62718950ee40dbdc819