Merge "Revert^2 "Add annotation for SourceDebugExtension metadata""