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

Change-Id: I42c841ed44d7c297168ab5756ac10908311f3f4f