Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: Iba4651c307b7795f2b4e1b42eed60821e2747f1c