Merge "Fail scan request if no channels are available" into oc-mr1-dev
am: 7ce813a612

Change-Id: I48fa59e26cd5bf5ced0bf92a655fc04f4295d39f