[automerger skipped] Merge "Make user explicitly set security type for tether...
[automerger skipped] Merge "Make user explicitly set security type for tether network" into pi-dev am: 0e721c59
am: 13f97a29 -s ours
Change-Id: I7f160e545d458ce3257379d54c46157158ea7633