Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev
am: b6962f2e44  -s ours

Change-Id: I1b25c4a207802376d4dcdbd26e26535d5e6d1f37