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

Change-Id: I502b067071bce2ae9feee7db1718a81d4d0fd4c7