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

Change-Id: Ia4328b430e42e117171e413b7504428c24d22fcf