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

Change-Id: Idf63cdd6ce59a2e879c304392ebce93d5f01cb77