Merge cherrypicks of ['googleplex-android-review.googlesource.com/31424959',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31424959', 'googleplex-android-review.googlesource.com/31766493', 'googleplex-android-review.googlesource.com/31816463', 'googleplex-android-review.googlesource.com/31816479', 'googleplex-android-review.googlesource.com/32486993'] into 25Q1-release.

Change-Id: I760eb461a0bac6256b50a8a9f8d3e88f15dec224