Merge "Fix to show correct value for data limit setting" into oc-mr1-dev