Merge "Stop encoding absolute paths in symbols" am: 9f576acde6
am: b93e8250d7

* commit 'b93e8250d7ffbf0760bda670dbcd2ad25b504e90':
  Stop encoding absolute paths in symbols