Merge "Revert^2 "Propagate SourceDebugExtension information"" am: 9fa280c2 am: 0f939934 am: 4a66fbe9 am: 0c57d520 Change-Id: I4ff577819d1a30df401bc435f3cb718f15229a90