Code style fix: @return -> @returns

Change-Id: I26daca6313bf09055af8f980ba0065782257fd54
Merge "Code style fix: @return -> @returns"