am 4acbdd28: Merge "Convert rawFolders from String to FolderList" into jb-ub-mail-ur8

* commit '4acbdd280d58d464c02b43759214906dd48d91bb':
  Convert rawFolders from String to FolderList