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

Change-Id: I2acd0021601741c9a7975f900d5d8ea36c4124cf