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

Change-Id: I331a13b07d74f2b7755e3165bc584a0152501a83