Merge "Fix DefaultFileNameMap behavior for URL cases involving a fragment."
am: 907340bb1e

Change-Id: I9b177b23ae5cf52e46a1b4d36835d4cf4dae384e