Merge "Make sure wait for the dm device" am: d70a5feb60 am: 496e667966 am: 8e1a4d6366
am: c1c3292560

Change-Id: Ic9e3354d2d7e43572939dce19d53c2c80d345068