am 680a35ba: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev am: 252b3e6f51

Original change: undetermined

Change-Id: I99d975f59bc7af5d11ec772957da8ab748d0edc0