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

Change-Id: I6d8a2fe7d4793cdcb59a0567b1de3066155f8efe