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

Change-Id: Ibe0aec880c03a3efebecfd96993f53220fb1f338