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

Change-Id: I19d817dfdeb54aba404ac8c2109d83024f052e90