Merge "set NBM_FEATURE_FLAG to true." into udc-d1-dev