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

Change-Id: Ic1eb4c2fb39b6c695e08fefa6bcc8efc139571b5