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