Merge "support vzw roaming default on" into pi-dev
am: 369d65b2e9

Change-Id: I056adbebe1efecb1a7d6f4fc09fbd94f1e4b52da