Merge "PHPVersionCheck: Remove bogus @return tags"