Merge "Prepare CaptivePortalLogin for system_current" am: 74b1c8626e
am: 9b29d62990

Change-Id: Id953d39b834fbe72137fcd7ee3b4aacc92266dbd