Merge "Add jgaillard to OWNERS"