Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f am: 6f2d79464d
am: 8d60db5241

Change-Id: I9484e2d577ca547bbff4b516fcb445b4e8cdcdef