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

Change-Id: I737eecbc9b3ee76652f097d3b003c2c8708809fd