Merge "Add Folder to mime types, don't display null data" into arc-apps
am: 871b057911

Change-Id: I89349ad494c14e3e1e032baf1a099c60703e9ee9