am 1916b11a: am 93efff32: Merge "Added in change to ensure file name is passed through debug info"

* commit '1916b11aa228c04a5fc0464b3c3d96d3be7fe1f8':
  Added in change to ensure file name is passed through debug info