Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: I0fca9b0d97252ed49425aa0638b1b045e49dc83c