Merge "Fix b/306655749" into main