Merge "userdata_checkpoint_remount: delete all devices in dm-stack under /data" am: da776c394d am: a4da27f40a am: 665fd6dd6d

Change-Id: I3ce18676a0c47517b683767d8ab83688c28b9cc0