Merge "Correct illegal mockito usage."
am: 5bb1e8c9bc

Change-Id: Ib8c6436b72d0cbb7133a9a2b0586f8263adf598e