Merge "Fix crash when scanner gets results that don't match the request" into nyc-dev
tree: 0037439827e922e1148454692129f20fcbe1292c
  1. service/
  2. tests/