Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: I66650e99adc4baafd8e16d63dc89242daaa16063