Add missing @return tags

Change-Id: I397971a02aa247f51ff4ff4ada3e50d66783ec2e
Merge "Add missing @return tags"