Merge "Propagate SourceDebugExtension information" am: af8b407e56
am: 688efdefd4

Change-Id: I4efcd1c154229d2e2b855e0e1b354e334d7400cc