Merge "Update OWNER file to new owner"