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

Change-Id: Ieb18dfd590de71630f88a288d96b7251782525d5