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

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