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

Change-Id: I45314ed256c8d88df135063531ad17292e895b43