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

Change-Id: Id56843030e465e8df76ac3c0da7e67e7aa55fa2a