Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd
am: e83d4f6c7d

Change-Id: I58a2924860ac78bf9611fdb887b7ea7e0a313caa