Merge cherrypicks of ['googleplex-android-review.googlesource.com/29569717', 'googleplex-android-review.googlesource.com/29566629'] into 24Q4-release.

Change-Id: I609015247eff2961f65897697b4d083d5cf509aa