Merge "Fix two zygote imports."