Merge "Report single scan failure on inconsistent event" into oc-dev
am: 55e2eef260

Change-Id: I270bb0405e66ecbd2af8a88137cd687d3ee7442c
tree: d56b59c81424479e22379186c8a1ff49415161c9
  1. service/
  2. PREUPLOAD.cfg