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

Change-Id: Id28b1ca3f4684fb081083d3f609f47164db7e806