Merge "Move UriCodec to be near its one user"