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

Change-Id: I4ff577819d1a30df401bc435f3cb718f15229a90