Merge "Switch out existing PhoneConstants" am: 322271ae59 am: 8f5e57e7c6 am: 1671761a01

Change-Id: If8e08d8f6d02540937919d3a36fa42d2d78726b8