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

Change-Id: I99e79b9e94d511f1e5267c5125f98c3a9fb51506