Merge "init: fix first stage mount failure due to /dev/device-mapper not found" into oc-dev
am: 22d73dd093  -s ours

Change-Id: I3a539032598bd7bccd36361ce593123313ecb4ac