Merge "Fail scan request if no channels are available" into oc-mr1-dev