Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade mockito-core to 2.28.2

Change-Id: I9b73afddbc728fb27ea756dbede0667289a1fd24