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

Change-Id: Idff2023e24282520109c62ca5855a979e5734c38