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

Change-Id: I00db288692d76a4fb25dea861ee996fa1aee243a