Merge "Fixed the text alignment with RTL text" into oc-dr1-dev
am: 198218809e

Change-Id: If4addbc49a299fbee7ccb23f84852897269475d3