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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29488085', 'googleplex-android-review.googlesource.com/29479905', 'googleplex-android-review.googlesource.com/29599066', 'googleplex-android-review.googlesource.com/29599393', 'googleplex-android-review.googlesource.com/29599397'] into 24Q4-release.

Change-Id: If35291ba2b4bf75be3db51f5535f185425464a6e