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

Change-Id: I6e963816f63e55a07636c92962ae409edff22f9a