Merge "Remove a few left-over @FutureFeature markers from diagnostics API"