Merge "umount /data/user/0 before umount /data" am: 3a0fd35b62 am: 20f9f29d53

Change-Id: If73d45b2048ef3031f1f38180735ab542b7dbdfd