Merge "Expose captive portal urls for configuration"
am: 07a100484f

Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0
tree: 9924ebc160263c98b5d4c19f46a130bc9b9fc1fc
  1. core/
  2. services/
  3. tests/