Merge "Merge "Added configuration for VT downgrade/tear down when data disabled" am: 0463a7d3 am: 55f8fb4e am: 8ade2761"