Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I8e953806ace53c5fff010296510a8910328f986f