Merge "Fix sonar issues in messagerouter-messageservice"