DO NOT MERGE: Add option to skip and avoid captive portals. am: 488c84ca1f -s ours am: 8006bd5c66 -s ours am: c5585a4fec
am: b0e87a6774 -s ours
Change-Id: I6af06157789b0eed11588d697e42776cdaafdb11
This commit is contained in: