Merge "Add a flag to indicate if a ScanData is for a scan for all channels" into nyc-mr1-dev