Merge "Remove gaillard@ from OWNERS file." into main