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

Change-Id: I3856c8fd08cdee6171eb876b4ff0314a289ae5a9