Merge "Change NCM for upstream change in orchestrator"