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

Change-Id: I6ee69efe346eff3c391dc9251b9881b23d85042b