Merge "Propagate SourceDebugExtension information"