Fixing issue where folder names aren't being persisted

Change-Id: I94b40c49f2d737ae1ac03b3fa58ade8079256a8f
1 file changed