Merge \"Disable VT when users turn off data or hit data limit\" into nyc-mr1-dev
am: bcb5fe477d

Change-Id: Idbf856e9a0cb5482574bb8144003be17b9e13f16