Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.27.0

Change-Id: I252820926467f87cc8e4e7c145a47184d5e9f9f6