Merge "Make veridex not output whitelisted uses by default."
am: d6d2c06ca1

Change-Id: I2767c06c1cb6d3c3f42058277a58876f2bc21d90