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

Change-Id: Ia7637633ddf235421b5fc1a6164780bda71f1b0d