Merge "sonar issue for MMRestService.java"