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

Change-Id: Idc444801a6da7c19cfa947db07d84f24162a52c4