Merge "Revert "Add OWNERS block to facilitate in migration""