Merge "Revert "do not start shutdown animation from init"" am: 5d7439ff5b
am: 007db6bf44

Change-Id: Id41a3db434144dc4b10c544462ff8fe13169cf07