Merge "Remove unused fields in ScanResult.java"