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

Change-Id: I90ba8b94f6730cab7ec2850046a87dd50e894652