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

Change-Id: I65d5ddb917585cd190f62f146cacdeb379abbe09