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

Change-Id: Id6350e38680b318c4eaa53a28c47cf5fda884769