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

Change-Id: Idc90e9661301babd590f7e292148aef56e544dfc