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

Change-Id: I439d6888ed42174a6dfdf69a9f6d4f6ca8542fe3