Merge "API: Remove leading/trailing spaces from error and description text"