Merge "Updated the comments where the return codes are used in other types."