Merge "init: shutdown services in the opposite order that they started" am: 8e7942cbd1
am: 9f030d89dc

Change-Id: I5c83460633c56fcf740ca939b0dd931bee6854ab