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

Change-Id: I038321629b24e1a0683ce9af8430764ff139e6d4