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

Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3