Merge "support vzw roaming default on" into pi-dev