Merge "Remove wrong @return from doc blocks"