Merge "Refactor debug info position visiting"
am: 7dca45b967

Change-Id: I3da335a273163d0423903d2241a47e969e84dc16