Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.0

Change-Id: I9c3f3ccc58587f6256730ec97f6ed764ab7f9c84