Merge "Add bucketsScanned to ScanData" into nyc-dev