Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal." am: 1d18e60e76
am: 87bba9d278

Change-Id: Ie3e8a250b24acf668fbcdb48b6242e1ea83ebfa2