Merge "Fix iterator in ServiceManager::removeCallback" am: 73f4c61ceb am: 5c4f6504a1
am: ff9c02ac82

Change-Id: Id8b89b12243fcadbdb8965eb310569913108e381