Merge "Fix veridex reporting"
am: d1c23d7b94

Change-Id: If32991890c1a2c301f0017e871f8131329a10ba9