Merge "Added configuration for VT downgrade/tear down when data disabled"
am: 0463a7d38e

Change-Id: I4cdb29ef1d2dfd79bb9cf567fda83d56e6f658e4