Merge "Updating JavaDocs for more spans."