Merge "update the NO_DELIVERY_REPORTS list" into gingerbread