DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd14 -s ours am: 8006bd5c66 -s ours am: 573880a198
am: c39a37c0d6 -s ours
Change-Id: I6af06157789b0eed11588d697e42776cdaafdb11
This commit is contained in: