Merge "init: add wait_for_prop builtin command" am: d25e4c5819 am: 7f1dbd8f68
am: 6426815ecc

Change-Id: I9a02f6ba2b191d5159a62abc5c2ea77bf22d16fd