Merge "init: Support custom shutdown actions" into oc-dr1-dev
am: cea7028cf4  -s ours

Change-Id: I9b56a7dcf7b6db24d2e2fcc405e99e389cee4497