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

Change-Id: Iba6a609e507c25456618bfe53ebe035ecd1ede6d