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

Change-Id: I7499b245fcc5ad7b475b66df38357a0a5b424080