Merge "OWNERS: add more owners manually"