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

Change-Id: I1abf1adb0e98ad5c11a401182eadee26e0ce2c0c