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

Change-Id: Ica12cbae7a568a6134143e538397f8b4dcfce244