Merge "Use the getBidiFormattedPhoneNumber to replace getFormattedPhoneNumber"