Merge "Replace usages of littlemock with mockito" am: 0a11c83016
am: b29311bbba

Change-Id: I94c0ab304eb1ac8b68b897e6b74f737df2c2bff8