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

Change-Id: I0cef7deb44c9b55d7f9adbc7022bb484086449c9