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

Change-Id: I911953227eb43acda43f8475afe1202fa2fce727