Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: Ia516cb5b6037c6c99cf5f0c4fb7ce90ebf2de883