Merge "ncomp-core: Enable CLM scan job"