Merge "Fixed Bidi layout issue of MyInfo in Settings" am: cddb4a2965 am: 49ecfa1508
am: 2219783c1c

Change-Id: I6cc4e204fdfa70995bfc933edd06b7197976b3e5