Merge "init: Always reap processes before handling properties"
am: 0589aa4265

Change-Id: I825598315caa2a6fe592f293815adf8242f0a644