Merge "Remove hridya@ from OWNERS file"