Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: Ic87cf6bcc9b621e48fe12dbb8dddbe60749b3c09