Merge "Fix API in CaptivePortal, StaticIpConfiguration" am: cf0f380f4e am: fb943d00ca
am: 69528af3db

Change-Id: Icda65fe4a009a754b6a1a763d402820652d55391
tree: 3d3ccfe157b69a8d1d2d8585f81540d4d0332ad2
  1. core/
  2. services/
  3. tests/