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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35971033', 'googleplex-android-review.googlesource.com/35829440', 'googleplex-android-review.googlesource.com/36057582', 'googleplex-android-review.googlesource.com/36038619'] into 25Q4-release.

Change-Id: I1d5645559eae32e4b6e5c74d7660a4e1c3aecf1b