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

Change-Id: Icdb6c3cb600a65189ce0e7f7dd27a9fe975feb8e