Merge "Add a separate namespace for CaptivePortalLogin module."