Merge "De-couple data enabled from VT settings." into oc-mr1-dev