[SDC] Fix Sonar and CLM builds