Merge "init: shutdown,thermal shut off display immediately" am: 82ee4060ed
am: a27a48590a

Change-Id: I419ffe6fab44d138d84c92c811a0b03ace796c1a