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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35667023', 'googleplex-android-review.googlesource.com/35857436', 'googleplex-android-review.googlesource.com/35945575', 'googleplex-android-review.googlesource.com/36001281', 'googleplex-android-review.googlesource.com/36043002'] into 25Q4-release.

Change-Id: Id9aaea7bba9128315f2f7cea267d920afb373c04