Merge "Update mobile data icon" into oc-dev