Merge "Fix testing wrong variable for non zygote."