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

Change-Id: I50edaaa40f9329b07f368c4e40ab12f08152fb01