Merge "Error fix from enabling Clang thread-safety checks in Cuttlefish" into main