Merge "Captive portal: better detect empty responses" am: c217f7a9f3
am: af8e749820

Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c