Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I379fd83e060917dfb354053cd7f9e2ca774fe14c