Merge "Pass vendor-specific info as map." into oc-mr1-dev