Merge "Captive portal login shows specific network name" am: ea7322d17e
am: d4cb33b83f

Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d