Merge "remove emergency shutdown and improve init's reboot logic"
am: 437dc91fa3

Change-Id: I6d7cac831981f418562579750b3a96ec039ba677