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

Change-Id: Id14f0f943395f9c843d3c99d7d0aec7f9c365a78