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

Change-Id: I82eee20855710de2b4fb541dd5e2b887140ed364