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

Change-Id: Iade43ebe12f22062ba057f26ed617780b933f239