Merge "Removed littlemock dependency and cleanup" am: 1ab3beeb31 am: 9a90f916d9
am: 2f6e428731

Change-Id: I30bf0cc0fb761f315ee3c3abf58d0bbac30a0147