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

Change-Id: I3940c51a0c576d43afd3e731ef5e907c3a8618ab