Merge "Removed littlemock dependency and cleanup"
am: 1ab3beeb31

Change-Id: Ib32db9eaa28e62b18ca867b09531836742f17785