Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: Ic1d02ebc80039d91e75985fc573c32fadbb8945e