am 05c70484: (-s ours) Track crashing during migration to avoid crash loop. DO NOT MERGE.

* commit '05c70484a2c9db94bc66bb740fee3c180b10b4ff':
  Track crashing during migration to avoid crash loop. DO NOT MERGE.