Merge branch 'stable-2.15'

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: Ic04964616cb47dd6bcaae4eedb9d4e9090741bf6