Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7 am: 50f29d8ecf
am: bf4acfb71b

Change-Id: I8d4cb6a658f2e9d09b9904c722218ef594fb694a