Merge "init: Make sure /dev/block/by-name/userdata is created in snapshot mode." am: 0e70ce26b8 am: d8d2a1794e am: 25034d64f9
am: c1b9f5c736

Change-Id: I4dfc067205cc71501ab484a0d45bd3f31f4a0033