tree 23d924de3f4bbe73386ac66583f58217d3e0cf86
parent 79f2e98d97cde644bb1b0327a4d3bfeaf8dde8c7
author Paul Duffin <paulduffin@google.com> 1489085381 +0000
committer Paul Duffin <paulduffin@google.com> 1489085381 +0000

Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: I615ac9acd8fccd1af640ebc4475dc9538a14c27e