Merge "De-couple data enabled from VT settings." into oc-mr1-dev am: e0f1f26d87
am: 8d2b05ab50

Change-Id: Ib96d9d3e1dbbf5252806c8b50c2e023ed71d9e8d