Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I14a2a6ff4b39471c54fecf59446d67cdc12ba3cb