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

Change-Id: I68516e2faae2b0a2cf17e9b26165b03ac63b8bfd