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

Change-Id: I501251a8d97920961b55c5de4c9ff20f0a0edfbb