Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: Ie5ac742d4376e96286cc527a2331e91a17c85fd8
2 files changed