Merge "Fix API in CaptivePortal, StaticIpConfiguration" am: 0470353c2e am: 77daae9b3d
am: e86dfa92fe

Change-Id: Icda65fe4a009a754b6a1a763d402820652d55391