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

Change-Id: Ibb3aa685585e8dab22f504a7f862cad5e551ca96