Merge "Revert "Add EXTRA_STREAM_TYPE"" into nyc-support-25.4-dev