Merge "Added configuration for VT downgrade/tear down when data disabled"