Merge "Fix NullPointerException in CaptivePortalLogin"
am: d106aac67b

Change-Id: I6cbb44bd5b2a492b938f3d64a5f10c818df8cb22