Merge "Revert^2 "Propagate SourceDebugExtension information"" am: 9fa280c217 am: 0f93993442
am: 4a66fbe915

Change-Id: I6846ada110ff2899c946040917d88944c8265fa0