Merge "Stop running Sonar for ccsdk and sdnc"