Merge "Propagate SourceDebugExtension information"
am: af8b407e56

Change-Id: I389284031ac54786f94662957f037cfa9c91e89e