Merge "[veridex] Reflection detection improvements." into pi-dev
am: e6801b1004

Change-Id: I4b83d953ae51bfbb89f337c985b7635793d04673