Merge "Captive portal login shows specific network name" am: 01fb05cf62
am: 93fe99aca4

Change-Id: Ie4a418296de498b7d4b4eca75f2d0b3192ed4c64