Merge "umount /data/user/0 before umount /data" into rvc-dev am: 16df3dc2b5

Change-Id: I830613a9271a131e555eeb57f6e617053bf1a87a