Merge "Add a flag to indicate if a ScanData is for a scan for all channels" into nyc-mr1-dev am: 13d5e3b7fe
am: 399d807949

Change-Id: I5ebb51c8e2945196e924e6655669005397f347af