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

Change-Id: Ifca7385204731e6b764fbeda59570f1789ecc0e0