Merge "Move veridex to ClassAccessor" am: d0a4d1f71a
am: 6585b75987

Change-Id: I61e198609ad46ff3e6cca36b0aa149488a6b45da