Merge "Add security capabilities enums to ScanResult"