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

Change-Id: I32f46d6425e475f8cdc4b76c7ad4d6a00ca2b100