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

Change-Id: I3310fc40dda060f44990259e180937dbcdb756b6