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

Change-Id: I88390840922ba5c285f25e7d6066803b2b35d8ba