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

Change-Id: If5d28d989877faa8eaf86e2fb0302d122f77a260