Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev