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

Change-Id: Id67597e8d1bc2c725980a1581ea6644aaa113387