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

Change-Id: Iac3e95c2ea24ff70d2c28d8e5188fec7830d56bd