Merge "init: Cleanly shut down subcontext processes" am: f6b823141e
am: 01448be93e

Change-Id: I6bda91fa15fc3017a30ab5771bdc9262e139c737