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

Change-Id: I74d91a004e7430e65f54268223154e9d8d2fad02