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

Change-Id: I63a3bf9f2983bdb68df7ef48b334930a089648eb