Merge "init: Prevent spin loop while waiting for exec or property"
am: c1ca1a8328

Change-Id: I591ac447da8d1a6f5db9e2aa48e30c80e0c5e631