Merge cherrypicks of ['googleplex-android-review.googlesource.com/28182527', 'googleplex-android-review.googlesource.com/28478736'] into 24Q3-release.

Change-Id: Ic4a6d6056517117ed39c85f6871233291fad9ded