Merge "Fix delivery report error with PENDING status in SMS" into gingerbread