Merge cherrypicks of ['android-review.googlesource.com/3009853'] into 24Q2-release.

Change-Id: Ieef9d93e7d0b821122b3d5d8a19bf4d9390a8d17