Merge mirror-goog-main-external into main Bug: 405419211 Bug: 405352175 Bug: 406229744 Test: Treehugger Change-Id: I77cbed8d956c1657f6496cc78d0c8d4733f1adfe