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

Change-Id: If3ff20e0091100d19a8efa0756e418faef646c3c