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

Change-Id: I42df910d990b9e8bc9c286b688e5e360ee33774f