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