Merge "Fixed BiDi layout issue in screen "Add FDN""
am: 5309d2f8bc

Change-Id: I63b2b311b376e283827f6f44b5c79b1648008292