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

Change-Id: I47059d5e0f50c2f39a573e814911579ecdc92c94