Merge "ART: Add correct field index to reference visiting"
am: ad4ee2641d

Change-Id: I493e87a4e294a024b1ccb335cc4b54563f33726a