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

Change-Id: I5821ee53c0a71ff5a91bae6dcefc3a11bc66101f