Add missing @return and @param to doc blocks

Change-Id: I9d99ba1968ed8f97624d957754c8847dfe1b41da
Merge "Add missing @return and @param to doc blocks"