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

Change-Id: Idd9d5abf5741b7bc040fbe2817e6cf465cff7386