Merge "Revert "Propagate SourceDebugExtension information"" am: 5b786dd9af am: b78be525c6 am: ce877de617
am: f182ed449a

Change-Id: I075c31f4267005a54c91d41211bc2472231d5af8