Merge "Change VENDOR program types to range." into oc-mr1-dev