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

Change-Id: I7818bf4b296cb091de1f6ceb563e9b0373ec0b26