Merge "init: always initialize device-mapper"
am: 8a3630e327

Change-Id: I0d67ff1504b05abcd890977446bd6b58b6334f5f