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

Change-Id: I9f8b6c783ae7492366112d8b57e297ef59aa7d1c