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

Change-Id: Ia53f350beda8d9671cb67c2a01ed0071b65c4b76