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

Change-Id: Ibae90ae05b36129a34a358bb60ffd7ad23e3c4a4