[automerger skipped] Merge "Wait for dm device to be ready before format" am: b3001b9f28 am: 65faa9850c
am: f56ae9c612  -s ours

Change-Id: I8ee90035b74dc822677a72f350af40ae5116082f