Merge cherrypicks of ['googleplex-android-review.googlesource.com/31157950', 'googleplex-android-review.googlesource.com/31156006', 'googleplex-android-review.googlesource.com/31178803', 'googleplex-android-review.googlesource.com/31171156'] into 25Q1-release.

Change-Id: I7c05bd800460ec93c511300a1ae64d1fec4b7df5