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

Change-Id: I533c0f7c3315bc5094ce4324f907c93b5b16b9a4