Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I0c30d89884cd96a8c3ce51a938ebfd29c8b89f80