Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev am: d97ccb1c0b
am: b141077015  -s ours

Change-Id: I0b67118d6326e9c2513157cd829676af6a6e8456