Merge "Fix build warnings for CaptivePortalLogin" am: fc0708615c
am: e34896af24

Change-Id: Id5ae42f19bb947aea1835dac460b030fad979422