am 6bbeaaeb: Merge "Remove Folder.newUnsafeInstance" into jb-ub-mail-ur9

* commit '6bbeaaebc4d6111e4b327a7f7761047b89e20e01':
  Remove Folder.newUnsafeInstance