Merge "contexthub: cleanup OWNERS"