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

Change-Id: Iefb4c3eb039734fb15e499312dc106b24ac0245b