Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.26.0

Change-Id: I3423d7b81765bdb1db3879904b5f7d7e940086eb