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

Change-Id: I9f8a641105d9d74ea93c9886c5153d8286f34861