Merge "Update OWNERS file to reflect ownership in capability related files"