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

Change-Id: I8606aed63df7fb46f805acadf3973f8f4dfe7d33