Merge "[SDNC] Fix dependencies for SDNRONLY mode"