Merge "Move veridex to ClassAccessor"
am: d0a4d1f71a

Change-Id: Ic721192c857cbaddf2324e6d4ab6e121c8e713e3