Merge "Fix RTL mobile data type indicators" into oc-dr1-dev am: 88da234e35
am: 876bc4e808

Change-Id: Id0013099fc0aa5f402eb6edf2454300fc9ff4637