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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25188216', 'googleplex-android-review.googlesource.com/25188217', 'googleplex-android-review.googlesource.com/25188218'] into 24Q1-release.

Change-Id: I9126d6943c211a02cbbb03442b6f77610424a0d5