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

Change-Id: I3f664293afa8314019c6c0a126f846c4447db668