Merge "Merge "Compile CaptivePortalLogin as system_current" am: a5a7af11d7 am: 2891385ae3 am: 441f6fdbd3"