am a38e1615: am 6360758c: Make sure we still handle shutdown-related message even if we\'re

* commit 'a38e1615c5963eb59ffdac60cc0bbe5415295818':
  Make sure we still handle shutdown-related message even if we're