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

Change-Id: I424cd828a7616c2947367bdb4a82a62cf17847e7