Merge "Update NO_DELIVERY_REPORTS list." into gingerbread