Merge "Fix API in CaptivePortal, StaticIpConfiguration"
am: d2c44d4a82

Change-Id: Ia36ba5946e8dc956c5c71cbebe7dc02658fdb7a0