Merge "Remove debug tracing for b/332386996" into main