Merge "No need to prompt user to restart device if already shutting down" am:...
Merge "No need to prompt user to restart device if already shutting down" am: e50fa2be am: a609060a am: 83c1cc60
am: 8b2721f3
Change-Id: I260b5623dad5f28381231129bae5ba9832dff2b1