Merge "Fix API in CaptivePortal, StaticIpConfiguration"