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

Change-Id: I6a123410da3940985945fc52acd1e8557c5d8c4a