Merge "Fix text alignment with rtl languages in entity header." into pi-dev
am: 7298297007

Change-Id: Ifa6e23aa7a5ea12309793b82c2c1a0056b45601f