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

Change-Id: Id7c7f3b1b3c18e7db16c1f5df11b010579a8e3ed