Merge "Switch out existing PhoneConstants"