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

Change-Id: Ib3e74bb26d0dc88258d3351256bc84a1bc11143f