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

Change-Id: I9d9d2e809cb9536c9a60fbb54cb086c0dfcc5503