Merge "Fix RTL mobile data type indicators" into oc-dr1-dev