Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito to 2.23.4

Change-Id: Ic95e8ba03b5463ea6206fad44a7c00cdc071a2aa