Merge "Add the ability to refresh to the captive portal app." am: fc71acde3b am: 504b886f8e
am: f93ad2203f

Change-Id: Icedc9a64a26b084a666fc9bbb246b22f8cf16917