Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I61dd307f552aee5ada31f41d8c07e18a1020dec2