Merge "CMService.java-Merge if statement"