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

Change-Id: I3ed4cbbbb2c79d62e786cfebe44766f11bac8a26