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

Change-Id: I702d77c693303f903d1daabd8746a4d5ea4cfb5f