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

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