Merge cherrypicks of ['android-review.googlesource.com/3161516', 'android-review.googlesource.com/3164298'] into 24Q3-release.

Change-Id: Ibc14ad8270eb2a152f9f43f891cdb509f5246891