am bb0b89f6: (-s ours) am 1916b11a: am 93efff32: Merge "Added in change to ensure file name is passed through debug info"

* commit 'bb0b89f6a9c691c8c3b6ad371831fce1812126a4':