Merge cherrypicks of ['android-review.googlesource.com/3282255'] into 24Q4-release. Change-Id: I32e95e02101a2a76a430a811596a0a70901a36de