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

Change-Id: I7291fc33e868a433f8da0a1ac87c54d9bb7b24fe