Merge "Prepare CaptivePortalLogin for system_current"
am: 74b1c8626e

Change-Id: I94b2c465290c36a601de89f6c9e8ebd138b2efe7