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

Change-Id: I1dc5526dacd24b4fb7c16c73add085148d569002