Merge "Type Allocation Code & Manufacturer Code" am: c42257e20e
am: 55ca9ec050

Change-Id: I39cd73bad77147f660ffe05e20c008c499c7d9fa