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

Change-Id: I001980f504db005dd8a220bc9c8ba514e48645cc