Merge "Make ScanResult final." into rvc-dev