Refactor code incompatible with Mockito 2.7.13

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