Refactor code incompatible with Mockito 2.7.13 am: a1ba743962 am: 430c2be3b9
am: 62bd372111

Change-Id: Ief852d9eeaee02325f37e8085acc45c33ecf4910