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

Change-Id: Ic63a01b2909c09d6179f10efcb23be5cd678052e