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

Change-Id: I63384015f7ad54b8e7c4caae31df5915add78004