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

Change-Id: Id3099d46be278ce60db72100adee6c882c216725