Merge "More clean up for sharing virtual files."