Merge "Allow apps to find imscm service"