Merge cherrypicks of ['googleplex-android-review.googlesource.com/26256747'] into 24Q1-release.

Change-Id: Ica3b1c64c8926509519bbb6b0e002e4f46330912