Merge "Update owners for keystore related files" into main