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

Change-Id: Ic29312bafaa18716b9223e7c7e2d9e86fb573392