Merge "Add colefaust@ and farivar@ to OWNERS"