Merge "Clear zygote space cards for CC" into oc-dev am: b285722533
am: 1ceeb0ddad

Change-Id: If5466a679df738894ef317a025d340bf3be7c073