Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I30c7719dc96f3cdb97d6b6091e4064be92167ca0