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

Change-Id: I8a1406e53448bd570ec90d5bf0f775378010d8c6