Merge "Captive portal login shows specific network name" am: 01fb05cf am: 93fe99ac am: 75faf02f am: f5b8d187 Change-Id: I5f7e59c7bcd7df41e0e243612c93c16fb64038c4