Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: Ibd16c046a4b631b39bf106404b382e0c0af9c09d