Refactor code incompatible with Mockito 2.7.13
am: d529415c68

Change-Id: I9c5f55ea1e7b9224033435159b19ef81fa9832e3