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

Change-Id: I37c1ed6d566efe3104b342f22a5ff52c9e459efc