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

Change-Id: Ibf32621c0e6a7fb8bef99adc493888151ad8aeaf