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

Change-Id: I52b93db8cb8bb468c2dcadcd34f7f634f92af41e