Merge "DefaultFileNameMap: Support extensions that contain '.'."