Merge "De-couple data enabled from VT settings." am: 29fc1d78a9
am: c7588904ba

Change-Id: I8b0d606848baa6cec1543a95b87ddf0cf0ba1ec6