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

Change-Id: I827cf80e9fbd58b021595d48dbb79c8819c87fcf