Remove redundant variable names from @return tags

Reason to touch these files are the @return tags.
I also made stuff private in the files I touched.

Change-Id: I679384b7f20b37759d087356258a762f0dc7bfc1
Merge "Remove redundant variable names from @return tags"