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

Change-Id: Ie76c7a1b9e3f478cc4b5dc2c057dee03b52a923d