Merge "Update references to use PhoneConstantConversion" am: 79694e79d1
am: 98f209c6e5

Change-Id: I5c7760471d2e48df20955122507b503ca546954e