Merge "[veridex] Reflective usage detection improvements."
am: cb21a56d81

Change-Id: Ia299c8147f69897ff4274cfa224d576c04f1f056