Fix @returns >> @return phpdoc

Change-Id: I086775010c500d3c64fc4f4d35a4e17b13593f5f
Merge "Fix @returns >> @return phpdoc"