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

Change-Id: I549fb22fdd6df9f3ca363eb47bd9f87a8d93ce6e