Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I2c05d09d998e3ee50b0088e0ac79057288ca4063