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

Change-Id: Ie284296d5cd9022993ce2e7a9f0caaaef4d36e78