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

Change-Id: I655635752d8a71d92564e5cd3c2c28df496a6b32