Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade mockito-core to 2.28.2

Change-Id: I7eec2d2566ccac3dcccde055ea8ec047fd54cadd