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

Change-Id: I03e1ec3fd12131ee7b86f5248b188bf7a2034261