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

Change-Id: I82eee20855710de2b4fb541dd5e2b887140ed364
tree: 255c5f2752d9fb48fd11a68c551271171f27e29f
  1. core/
  2. services/
  3. tests/