Merge "Update comment to use CAS-specific error codes"