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

Change-Id: I29385cb07a3b07b49ca18e32a883acd5cc03b506