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

Change-Id: I42c08b579130364fa12850de183f4bbd9761ab48