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

* commit '1520e9aeea89790738a746bbf0ac7689e5296ef2':
  Fix shutdown sequence to avoid SIGSEGV when running am command