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

Change-Id: Ib05a6d5713e7571221506fbb262dcda8f2072b9c