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

Change-Id: Iaae305d40fbf8e5b7095e79d3ade135dc0626ac0