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