Merge "Enable launching captive portal directly" into pi-dev am: 2483a40841
am: 4b8efabd20

Change-Id: I74f3634e25dfe0e6f20ff6441f412bc272cd72fe