Refactor code incompatible with Mockito 2.7.13
am: a1ba743962

Change-Id: I0b6870f3923c7e4e3c3d25de8114910bc3acda28