Merge "init: add wait_for_prop builtin command"
am: d25e4c5819

Change-Id: I8265906f497e89193f0c428c78bd1c4b178b3034