Merge "Remove unnecessary TODO comments."