am 612ca9c6: (-s ours) Merge "Fix shutdown sequence to avoid SIGSEGV when running am command"

* commit '612ca9c6a55bd932c45f5b85ae932a1b712dd914':
  Fix shutdown sequence to avoid SIGSEGV when running am command