Merge "init: shutdown,thermal shut off display immediately" am: 82ee4060ed am: a27a48590a am: 9c76b46e4e
am: 7b736efe13

Change-Id: I0b0e1845d4e6e38a28a20bfb8c7aada7fd03df81