Merge "Fix intermittent failure to add connection CTS failures." into sc-dev