Merge "Fix NullPointerException in CaptivePortalLogin" am: d106aac67b am: 3d70baf5ff
am: 7365713421

Change-Id: I2973d6361b5e5dacb1de4016fd450324620f0c32