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

Change-Id: I361a9f111f068e47fb2e1a93bf079c94a092017a