Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I539ef0711cfb772b54f1ee96d782ba5695555dfb