Merge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
am: 1f0151220e

Change-Id: I34df39f82516cb0e40c12a25340a7b3bb2c5f65a