Merge "Updated the comments where the status code is used in other types."