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

Change-Id: Id32407e4ba02989414d393c61661916453a42732