Merge "Fix mounting existing images on reboot"