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

Change-Id: I73e9b39cd3e8e1be818ff85431e6a22085c8b0e8