Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: Ib73ade5e0f486f0d312995a43a254bf67adaf940