Merge "Add cvlasov@ and kwadhera@ to OWNERS" into main