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

Change-Id: I1926ffc5d1e5664a493163b6875e6f443799a691