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