Merge "Wait for dm device to be ready before format" am: b3001b9f28
am: 65faa9850c

Change-Id: I3ab6bd7fd3c216b647b9a7552b28c2f2be285fdb