Merge "Fix zygote handling of when secondary image is out of date." am: ea9aa3ff93
am: 288d25c0b6

* commit '288d25c0b66a70258e2077d5408abb9e5083eb98':
  Fix zygote handling of when secondary image is out of date.