Merge \\\"Do not schedule restarts if the system is shutting down\\\" into...
Merge \\\"Do not schedule restarts if the system is shutting down\\\" into nyc-dev am: 1f015122 am: cf9c82b1
am: 57d605b7
Change-Id: I6f2fbc415e5aebbdde83692d0c00025bab6bf592