Merge "Fix API in CaptivePortal and ConnectivityManager"
tree: 53b3f5cb35c996b0cf27da9e4c96e9ab32c16fee
  1. core/
  2. services/
  3. tests/