Merge "Add UID printing to tombstone headers"