Merge "Move EnqueueableDataUpdate to a separate file"