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

Change-Id: I22299631ce85da00755247a1ee6fa7f2bb98c125