Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread