Merge "Fix incorrect phone number display in Bidi language" am: 4130d87543 am: fef1c4494b
am: 46bf60990b

Change-Id: Ia2d0ea64c5e4fd8077dbf0ad552280e8e8f383e7