Merge "Remove marcone from scoped storage owners file"