Merge "Fix ambiguous String8 conversion" into main