Merge cherrypicks of ['googleplex-android-review.googlesource.com/37276021'] into 24Q3-platform-release. Change-Id: I13c5d3fadaf4a6403ebac98dd3eeaff13ffd8553