Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I0cf79b45de4cffd5cdaa995359e704f07fdcde0d