Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I23de6ed2cad7222b24461fb1c35518568985a4b7