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

Change-Id: I19d89dca534052c48f9b06474daa3e9c78c64462