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

Change-Id: I75097ad94742cc935236dcab46422c520b20c77e