Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623
am: cadc34fd9a

Change-Id: I8e49ea0cec37f6abe8e5e31fb1adb83d696d969b