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

Change-Id: If7d6a3aac0e552b8ce073a661d5bf4b2b0fd950d