Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: Ibd84275605915d346010f2d5ff79f6df072e10b0