Fix @returns >> @return phpdoc

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