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