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

Change-Id: I58751eaa7981ac656fb202089b52373c640b0330