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

Change-Id: I197e8f5571e33a7055f1c32b0ebdd6c58a20fe56