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

Change-Id: I044b999156222d28ab2da0a2b2b7c4ef38d9137d