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

Change-Id: I1a271174915dd1c1bb3463331ebf53809020d9bc