Merge "Add OWNERS block for code move"