Bug 831303 - Fix the the stop where we start counting the shutdown time.r=ehsan.

--HG--
extra : rebase_source : 8d00557db0872b6c192c85b7ce364e8f9838ba9b