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

Change-Id: I9a9cf1a44233517d592e6c3de4c56be12f998020