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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30763907', 'googleplex-android-review.googlesource.com/30844889', 'googleplex-android-review.googlesource.com/30842514', 'googleplex-android-review.googlesource.com/30849722'] into 25Q1-release.

Change-Id: I979c2e0f4b4b9175927b871b9a19376489122910