Merge "cleanup camera OWNERS"