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

Change-Id: I04fa6f597cc1a6ed1623d52691f95c7d98ed7491