Merge "Add SystemApi for captive portal metrics"