Merge "Update ncm code for upstream changes"