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

Change-Id: I057fab5224c7298e37a396e16358b0d1bc573fbd