Merge "Don't consider uri empty a valid sound" into oc-dev