Merge "Check if stream exists on volume changed." into oc-dr1-dev
am: 6526347aa7

Change-Id: I747c3fba988fe1ed159f4b231a641c32de30a11e