Merge "Fix sonar issues in messagerouter/msgrtr"