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

Change-Id: I7e7c6ef02b57d25f80b48f1e5c0a77fd2be817cb