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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31940278', 'googleplex-android-review.googlesource.com/31959562', 'googleplex-android-review.googlesource.com/31986297', 'googleplex-android-review.googlesource.com/32081401'] into 25Q1-release.

Change-Id: I2faba842818d3558b2ae82724a7bee174216e6b1