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

Change-Id: I7feb713e45419ed22251c7841156dcb597ab93ea