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

Change-Id: I31e2870696ebd4ab0005ea2b38db7d965226e7a3