Merge "[veridex] Reflection detection improvements."
am: 3ec9fcc6c8

Change-Id: Iacf302f5b2bb9603ffdb7e994cd94afe52eab14d