Merge "Add mlstrustedobject to tombstone_data_file."