More clean up for sharing virtual files.
am: fd2b4dc007

Change-Id: If48a8d311225ee385aa3f4ca57d9d4d4ed6e9f90