Merge "Update references to use PhoneConstantConversion"