Merge "Update file type acceptance rules" into honeycomb