am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev

* commit '1b7f99b90ad5c4c20ee1bfbe3c7eb6bfb96a267e':
  Retry captiveportal check even if only one addr