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

Change-Id: Ia2e8e83f0c63add2a8ad807431e3c7055459eaed