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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29479089', 'googleplex-android-review.googlesource.com/29786736', 'googleplex-android-review.googlesource.com/29786429', 'googleplex-android-review.googlesource.com/29798985', 'googleplex-android-review.googlesource.com/29778785'] into 24Q4-release.

Change-Id: I9f97a0ef8388036950a01491eeb545f75aa826da