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

Change-Id: I4bf7a6fb8bfdc1144072cf84dd84127489fb86dd