fix issue 1337 (streams do not match IDD)

Change-Id: I950e52512d483673946845f52a0b12d59ceeb461
Merge "fix issue 1337 (streams do not match IDD)"