Merge "Fix API in CaptivePortal and ConnectivityManager"