Merge "Added additional comments for vendor error codes"