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

Change-Id: I1fa708806b962e8bd1d65150e838b3731b803892