Merge "Make user explicitly set security type for tether network" into pi-dev