Merge "Fix Sonar for nonrtric-controlpanel"