Merge "Add metric num_connectivity_oneshot_scans"