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