Merge "[SDC] Fix Sonar and CLM builds"