Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.24.5

Change-Id: I3f173c816941f80986084821a44452e6cb52f526