Merge "Revert^2 "Propagate SourceDebugExtension information""
am: 9fa280c217

Change-Id: I8d23fab57434233ce4fde59b2d29007b16c2bc55