Merge "Remove incorrect error reporting in MessageList" into froyo