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

Change-Id: I68d9b5d199165d53762165c46e16c65f4754f221