Merge "Fix usage of internal mockito API"
am: 5666119e79

Change-Id: I5e3242045e223702bd16df895fe204543cd9c05b