Added configuration for VT downgrade/tear down when data disabled
am: b7628321f4

Change-Id: I735d40ade87858320213501eaa750399c159428e