Merge "Check for errors for IServiceManager::get and list." am: a09202e9ac am: aa51c8c56f
am: bd7ba04be1

Change-Id: I73e85982d771f0e2009788567f71b52c4338464b