Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: Ib90ef3f582fa02000c51636eb9c289c9bc3a6121