Merge "Move 3 IMMS utility classes to services.jar"