Merge "msm: cpp: Support separate input stream identity."