Merge "Fix build warnings for CaptivePortalLogin"
am: fc0708615c

Change-Id: I96043c23bf3861c958ffd014e450728b665680e6