Merge "Fix CountMetricActiviationAndCondition CTS flake." into main