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

Change-Id: Ide851a92b034daafff5e1c5f5b9f376282d65a16