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

Change-Id: Ieac6f8911910c9fea16d60457b5108222f68ca92