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