Fix usage of internal mockito API am: 404b021b1f
am: de5e2f221d

Change-Id: Ic9f7c25c950ebf20aa0a0e27456b5eb7b9044399