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

Change-Id: Iee85dd20d2bc206dd3df8aa292763375a45e294a