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

Change-Id: I5f7e59c7bcd7df41e0e243612c93c16fb64038c4