Merge "Customizable MIME type <-> file extension mapping, step 3." am: 40eea593a0
am: 8996619c33

Change-Id: Ib7effb43e0996561bbd335f2def0be4821831998