Merge "Update the NO_DELIVERY_REPORTS lists"