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

Change-Id: I530107b1067810c4107cf22f4408d910190c9f7b