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

Change-Id: Ia05cc8428db4c6d98130f4ec1ff97fbb90d67fac