Merge "ResourcePathShortener deterministically handles hash collisions"