Merge "Fix carrier text rtl alignment" into oc-mr1-dev am: 7578b3db2c
am: b0f1d3f9eb

Change-Id: I7e52f942b804511b92eb06be9aa1fd27853b4227