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

Change-Id: I79fd7468ba8f57b65068ddbd6c557b16c9c91f99