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

Change-Id: Iaa162a8661ca5cec350696ce71661c99d8fd1196