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

Change-Id: I151b0b299990b21634a49ffc1b5a499bd30734b9