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

Change-Id: Icc569a1385883a1648d66544ecd65acef02e2673