Merge "Remove duplicate idmap classes from services.jar" into sc-dev