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

Change-Id: I48fa59e26cd5bf5ced0bf92a655fc04f4295d39f
tree: 80041ff08b1f1e0f92eb4e1c8b5f84895317660f
  1. service/
  2. PREUPLOAD.cfg