Merge "Switch out existing PhoneConstants" am: 322271ae59

Change-Id: Ia4cf82581bd21d963c3d66032ae2e49eee7b0367