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