Refactor FolderNameInfos.

Bug: 159508969

Change-Id: I984e7a4fc321392d06157c705392c1ba5672f348
8 files changed