am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"

* commit '158560ad66f860ab9bb822f98a0ef9cf3afa922f':
  Distinguish user-requested shutdown from power-related ones