Merge "Fix crash when scanner gets results that don\'t match the request" into nyc-dev
am: bf984686a3

* commit 'bf984686a38b0574c18f728a21dfadf620d5e427':
  Fix crash when scanner gets results that don't match the request

Change-Id: Ifd87f3dadc5a4fbec74808e6e8c605d494c8cc08
tree: 634e9eb2a3a985fca7490aff7019bcb9308ddd22
  1. service/
  2. tests/