Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev