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

Change-Id: I2eb72a34d8fa13514ad8946937972a725638711c