Merge "support vzw roaming default on" into pi-dev
am: 60691e9c47

Change-Id: I7da706e94f2467223d73547e77db0b7a646d51f5