Merge "Stop encoding absolute paths in symbols"