Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I5e42859691fda58161bb1a6832fa655745db4e11