Merge "Add missing @return and @param to doc blocks"