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

Change-Id: If952da4a303ca7c24c75e5b5a1ce9c17b5889ac2