Merge "Revert "Propagate SourceDebugExtension information""
am: 5b786dd9af

Change-Id: I0143934ff9fb2c7329f463979d866cef7a81033d