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

Change-Id: I84e0089d06bf84144ed9d6d9ce475158070af180