Merge "Unit tests for CustomTraceState." into main