Merge "Clear zygote space cards for CC" into oc-dev