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

Change-Id: I9a7a78640c5ca7a25d80764ce980ae38a5abcead