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

Change-Id: I27dd5cbaaa7a852226470475fa1db169593cce16