Merge "Clear zygote space cards for CC" am: 34478ae3a5 am: d7c7c0e2b7
am: ae4e08fc41

Change-Id: Icf0374f1f48165198ce188253f5dab5bbcb835e8