Merge "[content-capture] owners files updates"