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

Change-Id: I04399bcda8e6d451dc4ff91bd489d5f2a5771693