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

Change-Id: Ia36ba5946e8dc956c5c71cbebe7dc02658fdb7a0