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

* commit '82e780743046e620b724c28023b580e0e624bb15':
  Distinguish user-requested shutdown from power-related ones