Merge "Cleanup of Zygote files"