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

Change-Id: Icbb9a5208c5a090d0a7eff6533eff8987d216e9c