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

Change-Id: I816c7626ac0054d5d919462a452b7a5541c4f009