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: 825e477f
am: 7635669e
Change-Id: Ib7a85c51f7e8041a4364d6a34deda0088439ca71