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

Change-Id: Ic668ffeb8382b16f4ec52dcfa6e59f5e89656055