Merge cherrypicks of ['googleplex-android-review.googlesource.com/29668471'] into 24Q4-release.

Change-Id: I8eb9eed84ead70a858eec0acc89b09e38eb4293d