Merge "Revert "Add owners block for migration""