Merge "Add codes for scan vendor ies support"