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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27873895', 'googleplex-android-review.googlesource.com/27891039', 'googleplex-android-review.googlesource.com/27846188', 'googleplex-android-review.googlesource.com/27896058', 'googleplex-android-review.googlesource.com/27906595'] into 24Q3-release.

Change-Id: I054a36fa570280a752d7df78c0f41420f903d689