Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I056a98014a074e9ac7902923453fe3672f169b91