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

Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5