Merge "Use stream type if set by user" into lmp-mr1-dev