Merge "Refactor OWNERS file."