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

Change-Id: I2223011cbd5c0fb3e72a9dd64d2dc3a3e60ba23a