Merge branch 'stable-3.0' * stable-3.0: Upgrade mockito-core to 2.28.2 Change-Id: Icbed15c670753178fb600b4ffb32330eb3fd718f