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

Change-Id: Icb2528c9eb25a5fd02debdd7be4b4f3ab01e168b