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

Change-Id: I88af0e651307b48421047098833d28b97f57dd54