Merge "do not start shutdown animation from init" am: 84d43c8df7
am: 76a3b3ce5c

Change-Id: If1f6bba314fe2f09620ea0574715a51f68791e96