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

Change-Id: Idaab5d5a3c715e4bfaeb5ab3fc078e8e8427645f