Merge "Fully unmount existing storage in Zygote." into mnc-dev