Remove references to the Folder List

Change-Id: I9f6b9d7f6c5100324703449da4761e67266ebed0
5 files changed