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

Change-Id: I4d57ff85834dd0e35a69b453f4c7d4011ae3cd7b