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

Change-Id: I8629bb2b5e410cd5a052b9b87888c68837020b0f