Merge "Change the icon for the captive portal login app." am: d9614ed849
am: 32f240464c

Change-Id: I5d078aab9f067917b001c8f941a8984857c0cea6