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

Change-Id: Ife612928a2651d27322d7a4da6ad469b530759e4