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

Change-Id: I8e9f371bff44ad7fb3f0a809cea041c86168444f