Merge "Fix b/300640506" into main