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

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