Merge "Merge "Pass vendor-specific info as map." into oc-mr1-dev am: b4dcdd5f45" into oc-mr1-dev-plus-aosp