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

Change-Id: Ib214d4838862e2f841d318769c56fd749f7aeded