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

Change-Id: I6b578a227da1ac8d434de99143610b7c243ee159