Merge "Include zygote and drop unexpected samples"